Couple more deprecated things removed

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index caa42f9..eef5375 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2209,20 +2209,6 @@ function wfPercent( $nr, $acc = 2, $round = true ) {
        return $round ? round( $ret, $acc ) . '%' : "$ret%";
 }
 
-/**
- * Encrypt a username/password.
- *
- * @param $userid Integer: ID of the user
- * @param $password String: password of the user
- * @return String: hashed password
- * @deprecated since 1.13 Use User::crypt() or User::oldCrypt() instead
- */
-function wfEncryptPassword( $userid, $password ) {
-       wfDeprecated(__FUNCTION__);
-       # Just wrap around User::oldCrypt()
-       return User::oldCrypt( $password, $userid );
-}
-
 /**
  * Appends to second array if $value differs from that in $default
  *

diff --git a/includes/Linker.php b/includes/Linker.php
index 61d8b83..19b7dd0 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1974,12 +1974,6 @@ class Linker {
                return self::makeKnownLinkObj( $nt, $text, $query, $trail, $prefix, '', $style );
        }
 
-       /** Obsolete alias */
-       static function makeImage( $url, $alt = '' ) {
-               wfDeprecated( __METHOD__ );
-               return self::makeExternalImage( $url, $alt );
-       }
-
        /**
         * Creates the HTML source for images
         * @deprecated since 1.16 use makeImageLink2